Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: unify compute vnode logic #14526

Merged
merged 8 commits into from
Jan 15, 2024
Merged

Conversation

wenym1
Copy link
Contributor

@wenym1 wenym1 commented Jan 12, 2024

I hereby agree to the terms of the RisingWave Labs, Inc. Contributor License Agreement.

What's changed and what's your intention?

Currently in our batch StorageTable and streaming StateTable, we shared a similar logic to compute vnode.

if vnode_bitmap.is_none() {
    DEFAULT_VNODE
} else if vnode_col_index.is_some() {
    // get vnode directly from row
} else {
    assert!(dist_key_in_pk_indices is not empty);
    // compute vnode by provided dist key indices
}

Code with similar logic appear in both StorageTable and StateTable. In this PR, we unify this logic to the risingwave_storage::table::Distribution. The type is renamed to TableDistribution to be distinguished with the optimizer Distribution. The TableDistribution will hold a enum with the following definition

enum ComputeVnode {
    Singleton,
    DistKeyIndices {
        /// Indices of distribution key for computing vnode, based on the all columns of the table.
        dist_key_in_pk_indices: Vec<usize>,
    },
    VnodeColumnIndex {
        /// Indices of vnode columns.
        vnode_col_idx_in_pk: usize,
    },
}

Checklist

  • I have written necessary rustdoc comments
  • I have added necessary unit tests and integration tests
  • I have added test labels as necessary. See details.
  • I have added fuzzing tests or opened an issue to track them. (Optional, recommended for new SQL features Sqlsmith: Sql feature generation #7934).
  • My PR contains breaking changes. (If it deprecates some features, please create a tracking issue to remove them in the future).
  • All checks passed in ./risedev check (or alias, ./risedev c)
  • My PR changes performance-critical code. (Please run macro/micro-benchmarks and show the results.)
  • My PR contains critical fixes that are necessary to be merged into the latest release. (Please check out the details)

Documentation

  • My PR needs documentation updates. (Please use the Release note section below to summarize the impact on users)

Release note

If this PR includes changes that directly affect users or other significant modifications relevant to the community, kindly draft a release note to provide a concise summary of these changes. Please prioritize highlighting the impact these changes will have on users.

@wenym1
Copy link
Contributor Author

wenym1 commented Jan 12, 2024

This PR aims to behave consistently to before this PR. This PR is likely to affect the two behaviors of the following in log store, storage table and state table. The first is vnode bitmap management, including fetching the current vnode bitmap, and handling update vnode bitmap. The second is the logic of computing vnode.

If we can safely assume that, when we initially pass None as vnode bitmap, any later update_node_bitmap will not update the bitmap to any value other than the singleton vnode bitmap, the PR can ensure that the behavior is consistent to before this PR.

@wenym1 wenym1 force-pushed the yiming/unify-compute-vnode-logic branch from 27a75f4 to e6feb44 Compare January 15, 2024 03:14
Copy link
Member

@BugenZhao BugenZhao left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rest LGTM

@@ -87,6 +87,14 @@ impl VirtualNode {
Self(scalar as _)
}

pub const fn vnode_data_type() -> DataType {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It appears that RW_TYPE already exists.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed.

@wenym1 wenym1 enabled auto-merge January 15, 2024 07:41
Copy link
Contributor

@chenzl25 chenzl25 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@wenym1 wenym1 added this pull request to the merge queue Jan 15, 2024
Merged via the queue into main with commit 846196d Jan 15, 2024
26 of 27 checks passed
@wenym1 wenym1 deleted the yiming/unify-compute-vnode-logic branch January 15, 2024 08:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants